Change-Id: Ifbaf57bba49f169203cdb70db665e0878eea146f
mentioned in commit 6c0e6f21
mentioned in commit 59b5c33b