Merge "Use new UnsupportedAppUsage annotation."
am: f1839a9203

Change-Id: I4c09f599c643340daf7f69e257b7a7a096f8f272