Merge "Add @UnsupportedAppUsage annotations" am: 8cbc2e9ad1
am: 28eb381cae

Change-Id: I87dcade4c34edea96a5add0d3b259e312625fc34