Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb

Change-Id: I8d7ae39c3b292efb3ed55fe5743da2e5872f5890