Merge "Use new UnsupportedAppUsage annotation."
am: 1385dca8f6

Change-Id: I50c9bd452147a28fd2cb76f1d9fe91336b7104c1