Fixup NFC config

Change-Id: I66e95b50ae8e2ea88dcc11faa9927867d838d6af
Enable large heap for Trebuchet

Change-Id: I89da84d33e9c2f64fe95526bf6eb46af8a30b246
Merge branch into kk_mkt