Bug: 120502534 Change-Id: I10fc81bee6c18346be8e4c1574388f2dde6af5e5
mentioned in commit b9ad84a1
mentioned in commit 502e6ec0