Change-Id: If9dbef882fec330dc949be1e68f42cdcc87eb9d1
mentioned in commit 8a0b67e9
mentioned in commit 41ad01f6