am: 671948d2 Change-Id: I51774011a45153c35130b79cefa3de2994000a56
mentioned in commit b6e038f3
mentioned in commit eb0ef104