am: ed2d7c06 Change-Id: I664eeeb4d931328e5660e9de1daab338f5f9962b
mentioned in commit 127d7093
mentioned in commit 6e322f69