Bug: 158761377 Test: refactoring CL. Existing unit tests still pass. Change-Id: I9b91d16e92679e76d57cfc332342eaa7e6989907