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

Change-Id: I6b3287ca1b534f71abbdd652065a536b0a912a50