Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f

Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083