Change-Id: If9ce7ff743cf1f167fa7084a0f4c0c8d93d8512b
mentioned in commit 7e04ee02
mentioned in commit 523bea67