am: 88774682 Change-Id: If9416218f00f20797fba9a32f20a590fd6dc4d85
mentioned in commit f791ec91
mentioned in commit 87ddb5cd