am: a6ea5908 Change-Id: I840885f610ff829c45cc93317099e941fa0d205c
mentioned in commit 37fa335b
mentioned in commit b67c9b5f