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

Change-Id: Ibad1c39310722d99f2de6bb0d9fad64caa5dbba1