am: d2c85670 Change-Id: I607606dc105ba5064f0f84be981c15c8a5cee381
mentioned in commit 91d94f8c
mentioned in commit 386522bc