Merge "Add @UnsupportedAppUsage annotations" am: 3d05f769a3
am: 1d526c114f

Change-Id: I5129ab883001d54892adb068330614898214b61a