Merge "Update UnsupportedAppUsage annotations"