am: 79dd5fe4 Change-Id: I9c028ce2ce459d957897e6ddd2271eea4a4aaae9
mentioned in commit 29241d10
mentioned in commit 12cff50c