Clean up USER_OWNER reference in cmds.

Again, the easy ones.

Bug: 19913735
Change-Id: Ib9519cb8309b332258b20dee54a38007eaba3b1d
5 files changed