Bug: 129548613 Test: Manually tested. Change-Id: I0c71750f79bd771dab8d7a9674e2af5422c0abf7
mentioned in commit 4bf46a77
mentioned in commit 503f0517