Merge "Use new UnsupportedAppUsage annotation."
am: 89ac95017f

Change-Id: I35166c8e6e94b78ed240b1a878e097b40862b1a7