Change-Id: I59bcf8f5b11c7afc791c509f6244dc97d2c6b468
mentioned in commit 80342195
mentioned in commit 743ffba0