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

* commit 'd76b1a5dad2e26035fea9a6947b795c4ef0613dd':
  Disable unused features

Change-Id: I72bb5ef9c70531f8063e9fa6d2cc85f2a80159f9