Merge "Use new UnsupportedAppUsage annotation."
am: 9395887931

Change-Id: If7c0987b098608972ea743649561f5b803ea8d3c