Merge "Use new UnsupportedAppUsage annotation." am: 9938c70fb5 am: 1f8ff9d305

Change-Id: I2aa7c78de32e8abb96150d43500ecb29ba9ebd15