DO NOT MERGE Cleanup: applying comments made in a Q CP CL

Change-Id: Ib94ad45944de6f49e667f8cac0dd933ffccf63f4
Fix: 133861115
Test: manual
1 file changed