Merge "Use new UnsupportedAppUsage annotation."
am: e1432f59ee

Change-Id: Ia47146f1d77272080a88aba13abb4688c7df47db