Merge "Use new UnsupportedAppUsage annotation."
am: 70a89435e7

Change-Id: Ib2b76714b6ca2947a57aeafbb6ab48359a5888a3