am: e0b88340 Change-Id: I4c8d3b019043df1ca1aaa4b04b961ac02fbfeb89
mentioned in commit edd745de
mentioned in commit acab6806