am: fa7ec5bd Change-Id: I64f0639c14cf0a42a49abe03ababb0fc132e1894
mentioned in commit 0f392656
mentioned in commit 90d04650