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

Change-Id: I659a10f4b65bfe7d7227a049ca4b105ba0ff451b