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