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

* commit '69d563e1979c0f8288db05261bdabbd4d60e12f8':

Change-Id: I2e70836ccb7bcc16c7488e685a8e1b19d278eb6d