am: eb512b68 Change-Id: I4741b279595f0881921428982cc5b745bc140cc8
mentioned in commit 2e3f50fd
mentioned in commit 7bf526d2