Change-Id: I9aa21b4aae1acafce79de7964f22b03796270260
mentioned in commit 3eec4157
mentioned in commit 0e569388