Refactoring to support an upcoming change am: 5b1ab66579
am: f630b3e40a

Change-Id: I6a1d4d4d71e7b7ae99edc69d95736c123d1faae4