Merge "Use new UnsupportedAppUsage annotation." am: a42b3d7193 am: b9dc3411d1 am: 278bf197fb

Change-Id: If9826d1a7318dcbc42f2abac5254e4d47667cf01