Merge "Add notice for adding users in AOSP."