Merge "Use new UnsupportedAppUsage annotation."
am: 9938c70fb5

Change-Id: I1345b127d08854f21be9ea4d6ed3fd961f336139