Change-Id: I8980fa65b3d3895197b24a3fdb30451fc757462c
mentioned in commit 42ca6e39
mentioned in commit 87b50e3b