Bug: 129548613 Test: Manually tested. Change-Id: I6a38b30155b50c42184519e9ed6662d837009566
mentioned in commit 1be32745
mentioned in commit 15fe125f