Merge "Null pointer check for Bluetooth traffic" into pi-dev am: 2f6f33fa79
am: 263914125a

Change-Id: I5225985621b3e3402996a42f4bed5eddc57597e9