Bug: 123720093 Test: Manually tested. Change-Id: I4c9105ce0d21af2542d400d5d2d13fe3cef0f924
mentioned in commit 46fcbffd
mentioned in commit 876edd00