Merge "Use new UnsupportedAppUsage annotation." am: c674b05757 am: 1dbb9a95cf

Change-Id: I2fd5afa6c99c6abc99442571a20e9c30e5e807d8