changes to fix bluetooth for Mega

Change-Id: I894056f7747be88122d13411a285bf32ad964cdf