Use new UnsupportedAppUsage annotation. am: 0b1b0c9ceb am: 8c8647ce5c am: ee58ce6a19

Change-Id: I8e29389c85d0176759a58d0bba4899b1a39d2d19