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

Change-Id: I6ad5122115407fc8fa1d2ae8743c69d071e9d23c