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

Change-Id: I48f93c43b66f4d329ef6068b4f74b4c68809c099