am: 52b2ed7c Change-Id: I5ddc7743c0005ad4fa76fc5c99f0f8ccaebf3ff0
mentioned in commit ea6fb92a
mentioned in commit ff817bdb