am: 06d74e4d Change-Id: Icf968f1fb8927b2b356718c41983579db0e1b65c
mentioned in commit f6556034
mentioned in commit e1756797