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

Change-Id: Ib795f10f5f663a67cabdaa5f2d0f3a24249f648f