am: fef87a55 Change-Id: I6acabf5df83fe2e60769191bb32a2f2ed7d69ca7
mentioned in commit 9ce5211a
mentioned in commit 12476d21