Change-Id: I2665f558f50c7226d1bf0ec7a9327913894fa39c
mentioned in commit 547fdc63
mentioned in commit d9f905ca