Merge "Use new UnsupportedAppUsage annotation." am: 39f329c52a am: 62169a75cc

Change-Id: Ib94ae7e9f19c543d0180e3a547fc02f55c055ca7