Bug: 306539165 Test: manual, verified changes on device file Change-Id: I9320f47ea83482b041130f16b1ad6814abc11143