am: 32606785 Change-Id: I16deb0ac3470d4bf590fc777d3064c676b261215
mentioned in commit 5a9f293d
mentioned in commit c14da8b4