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

Change-Id: I25156d66b989d23ccf42e303138fcf5e27cc489e