Merge "Add @UnsupportedAppUsage annotations" am: 196eb1d929
am: 83271288ec

Change-Id: I4d68830f98dece9b77a4ad4cd3769172f00eb0cc