Bug: 124234733 Change-Id: Ic577fdb067e706e5369422c1b34fce1705db4264
mentioned in commit 06fa7634
mentioned in commit 25b22b41