Merge "Use new UnsupportedAppUsage annotation."
am: 70129fc863

Change-Id: I86ab79e8649c86f69e7435a619c7dce08d432d98