am: e8ea6bff Change-Id: I642a5c7ae46ce3d4c7660cb1253c65bfd7d1a162
mentioned in commit 438ea03d
mentioned in commit 37e7439c