am: a1534d91 Change-Id: I7f48897e9bdc770692800a30aaba2deeb2c535b5
mentioned in commit c174e825
mentioned in commit 735e1256