Change-Id: Idef6b12752762da9dabfd97efcbbfa24a9fcbfc1
mentioned in commit e02a2e90
mentioned in commit 93623a77