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

Change-Id: Ib3d86ed6914a5d265113098f806aaa8b2ab10ec5