Change-Id: I29c6b7205c591439caed187a4a4e51a4044646c8
mentioned in commit 80007dcb
mentioned in commit 2d86a9aa