Merge "Use new UnsupportedAppUsage annotation." am: f1839a9203 am: 024e260d05 am: 41e3b486d5

Change-Id: I5c715ef8efe706da68b11bb0038337b0d916198b