Merge "Use new UnsupportedAppUsage annotation." am: b2c3eaaf10 am: 904b7f9de2

Change-Id: I62868fbcba5ffd65a441808e2a0cda59c9597654