am: d4d1512b64
* commit 'd4d1512b64df37157f3fa9c205f1dd3738b47e21':
Disable unused features
Change-Id: Ib4544a538b041e42ec5751f33c6bc90e5195c93b
am: d4d1512b64
* commit 'd4d1512b64df37157f3fa9c205f1dd3738b47e21':
Disable unused features
Change-Id: Ib4544a538b041e42ec5751f33c6bc90e5195c93b