Merge "Merge "Disable unused features" into nyc-dev am: d4d1512b64 am: 69d563e197" into nyc-mr1-dev-plus-aosp