am: bc747cc3 Change-Id: I44f2066694077699645acc0225f63a49ea0c4956
mentioned in commit d00f0096
mentioned in commit f4714b6d