Merge "Disable unused features" into nyc-dev
am: d4d1512b64

* commit 'd4d1512b64df37157f3fa9c205f1dd3738b47e21':
  Disable unused features

Change-Id: I1e4e6a9718b4a53827bf7d7dc3da92b7acab7f7f