Merge "Comment out user names that cannot be found in AOSP."