Bug: 120848293 Change-Id: Ic82173b13a4a476df28210c388af0ad1d4fc9545
mentioned in commit 86ac71e8
mentioned in commit 2a558f94