Bug: 129548613 Test: Manually tested. Change-Id: Iea7d1b73ef3cc25c7115e9ba9bcec9d517452163
mentioned in commit 75840c81
mentioned in commit edcc8b4a