am: f8878940 Change-Id: If5186f053a4380b657352658311c17234ac7ac16
mentioned in commit 592ae79a
mentioned in commit eaa57609