Bug: 129548613 Test: Manually tested. Change-Id: I40e383b671003e7949a65a37189a3ed9757485f5
mentioned in commit d3724f77
mentioned in commit 38d5d51f