am: c7416768 Change-Id: I49cc93ebdd474dd5555512b31d0f39694b772c97
mentioned in commit 392b9fcc
mentioned in commit 07f6d277