am: b00f6c54 Change-Id: I133918dba540c7bde620e8e77dddf6f251d3b611
mentioned in commit 72f680fa
mentioned in commit 61250a59