Change-Id: I7fec878072f392b35451d2b1a413d5990a454fdd
mentioned in commit 61dcbaac
mentioned in commit 502da648