am: aafe9c77 Change-Id: Ia5ba50c61052c3370695cd9cd2d22d77dbceca65
mentioned in commit 9bc4c428
mentioned in commit bb9b4775