Merge "Use new UnsupportedAppUsage annotation."
am: 57a0beab18

Change-Id: I7bae7b4226e18f1e75d8973c61d58041a462b77c