Bug: 129548613 Test: Manually tested. Change-Id: I38f7ef23595ba6c23782867ad35a96399bbacf9b
mentioned in commit 23a0fe98
mentioned in commit 26d8c98a