Bug: 284032615 Test: Manually on device and unit test Change-Id: I4ccbf5892b3830a6c4657e43850d9b0eab5aecba