Merge "Update java doc to reflect EXTRA_USER"