Change-Id: I64df972f69d9eda0669ce17d3c32678078aa161f
mentioned in commit 61dcbaac
mentioned in commit 1b2b2b0d