am: 6093b7f8 Change-Id: I9badff0e8f266e98c65c4ef2041ae74afe958aef
mentioned in commit c5b7be4a
mentioned in commit 8182949c