am: 8f0b0edb Change-Id: I47257a6e88367d701af50ecac85512939fec99fd
mentioned in commit 769bc72f
mentioned in commit 93285bf7