Bug: 170432460 Test: refactoring CL. Existing unit tests still pass Change-Id: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42 Merged-In: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42
Bug: 170432460 Test: refactoring CL. Existing unit tests still pass Change-Id: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42 Merged-In: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42