Merge "Use new UnsupportedAppUsage annotation."
am: c764cb634d

Change-Id: I610edc65a341c79fce13d3e1b09cb389876d4c7e