Merge "Clean up USER_OWNER references in am/pm commands."