Merge "Remove a user/userdebug difference." am: 363a602bd1
am: 47991c1b07

Change-Id: I67b907540790306ff3b8ee1fc23ff9c6787dbf8c