Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d am: c7f44bacbe

Change-Id: I30839db2fe99ba4670ec1b39d5e64540fdd15f69