Merge "Use new UnsupportedAppUsage annotation."
am: 39f329c52a

Change-Id: Ib6b8e9cbc5cb7c1941d1dd549d45065e71a532e5