Change-Id: I7d65897bdf8915e386846a1a6848c6a044217720
mentioned in commit b4e0ebe6
mentioned in commit 86766036