Merge "Fault tolerance in Bluedroid" into jb-mr1-dev