am: 882ed397 Change-Id: I67c35c0c91a79bc3bb373a56e721d7471e3d50a8
mentioned in commit 627a82c1
mentioned in commit 608f85b6