Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev