am: 39287b12 Change-Id: Iec541f4ddc36e226853000735d65409d1160c605
mentioned in commit 04e80b58
mentioned in commit 65efaa62