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

Change-Id: I5b41fb959df5c8ea1585aec9eebeac037e0885d8