Bug: 122330825 Test: build Change-Id: Ie9fa2f04b90d0c3c84e4e3a62924fdfd1c10fda3
mentioned in commit 8ce915dd
mentioned in commit 64e585f9
mentioned in commit cb190a84