Change-Id: I99c09537dff2c46bbdcb08ff26e41bc1e8b58253
mentioned in commit b2cbd045
mentioned in commit 0390b6a0