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

Change-Id: Id4ddb2398489c33fc13e5d633733c79f9d3879e6