FOllow our bluedroid again

Change-Id: If3f89bcddfd14c0a9a9f5e5f938be73c7abd2f1f