Bug: 37255419 Test: refactoring CL. Existing unit tests still pass. Change-Id: I6fe5d09bc58021fe196dc8ee739280d70f9d0017
2c826d7