Merge "Use new UnsupportedAppUsage annotation." am: 70a89435e7 am: 4220fc33a1

Change-Id: I0960879c5cd2791fa7cc27746474d6ebf2f61c9e