Merge "Use new UnsupportedAppUsage annotation."
am: b2c3eaaf10

Change-Id: Id44c463fde41f5283d17827b6ff884c52b1d2577