Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35

Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273