Bug: 120848293 Change-Id: I80e45d40d4f4e1cfa9bbb69255adec37ce97697e
mentioned in commit da54d2ea
mentioned in commit 1d65e00e