Merge "Add @UnsupportedAppUsage annotations" am: eabac25941
am: af43472016

Change-Id: Icea7bcde6cb67ce96236a9f703d1e3093728faaf