am: 4ee43b8c Change-Id: I99dabb50519c6d2552786bcaa7437f8f0b97f636
mentioned in commit 551557d5
mentioned in commit 4889d54e