Android n-iot-release-smart-display (NIT1.180611.004)
Merge "Add some missing @Deprecated annotations."