Merge "Add @UnsupportedAppUsage annotations" am: 0d9029cf3c
am: e38a714d49

Change-Id: I155d277642369f0b12fc58538cda7dee20fb0373