am: 53705e06 Change-Id: Ia8034996f190c673ddec7f2372d76f32253895df
mentioned in commit 1752d684
mentioned in commit 84044ecc