Bug: 129548613 Test: Manually tested. Change-Id: I6e48843d5ad656bc94c8a1da77e2a20b98499796
mentioned in commit c11965ca
mentioned in commit cc415317