Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f am: 01928676 am: f6253ef4 Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a