Clean up USER_OWNER reference.

Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
5 files changed