Change-Id: I7801145d3775c5f9c197d471470b62ca1ebd45fe
mentioned in commit b2b47254
mentioned in commit 55f8097d