Bug: 38475809 Test: manual - visual inspection of code Change-Id: I9e58c9699fc2e6afad38db6b44f2e2b649564327