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

Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f