am: 0eff06dd Change-Id: I272dfc319f51b4e5cd298377462f50506cba2314
mentioned in commit d0bd2c3f
mentioned in commit b097b954