Change-Id: If76385cf244a0f771ab84cc6bddad1b493255dc9
mentioned in commit 90e15531
mentioned in commit fd247a94
mentioned in commit 647db581
mentioned in commit 4ef6940e