Change-Id: I26f47263e5cd525e8f0fc2be3b4fd47d2306047c
mentioned in commit 0973390a
mentioned in commit d7add8e3