am: 3bc8002e Change-Id: I78d5cef97ab4ea0e7931f53655f8fbf4a44a1d1c
mentioned in commit 78e6dfff
mentioned in commit 36b3ed20