Bug: 137389675 Test: Manually tested. Change-Id: Id3bf8e15a0fda711f33f21ec38427ad1672a71ab
mentioned in commit 26f16a49
mentioned in commit 4c7cf587