am: e6bfffa9 Change-Id: I3b5fbb532ded31fe4efb0719aff27c39b2e19576
mentioned in commit 2c95b1ab
mentioned in commit e3422913