Test: refactoring CL. Existing unit tests still pass. bug:27762775 Change-Id: Ic4e914b3a941c3d545f8ce9e320e638973df0e91