Test: none BUG=122391143 Change-Id: I7977c3a4f021bc59eb4f04e443c3ec99c048f41d
mentioned in commit 7cc85c10