Merge "Add @UnsupportedAppUsage annotations" am: 09426de69d
am: 4bd5774611

Change-Id: Ibf3acf98e452060afa8975b6f91a8921c0032e80