Merge "Use new UnsupportedAppUsage annotation."
am: c674b05757

Change-Id: If1d018c3d0067f137ee8717cc0ebe725dbd561a4