Change-Id: I6312b972019a5d98f9466faf83a958de2fe9657d
mentioned in commit 2b4baf40
mentioned in commit 962582fd