am: 34be3cba Change-Id: Id395e9a4f839ad338be2513c78c0f8129264cb22
mentioned in commit 40081ac5
mentioned in commit 06e6b664