Merge "Merge "Add publicAlternatives to @UnsupportedAppUsage" am: 2ac6496fb8 am: d9a8aaa62b am: bb5a8217e9"