Merge "Use new UnsupportedAppUsage annotation."
am: 27e06cc275

Change-Id: I6af68725f838a5aa7f6b00cc92cbd424d6ac5ce9