Refactoring to support an upcoming change
am: 8c74627148  -s ours

Change-Id: Ic22f8d79e303c2e1084858ab898317cd14a73756