am: 347ef0a0 Change-Id: If684dd0f24fa6001273b856a617b1ead289aeb6e
mentioned in commit d5fe2bb6
mentioned in commit e7260d17