Upate for initial compile and removal of bt

Change-Id: I607674490fb9527be30c2f8c5b3fd07b91910eb0