Merge 534e0975e4808f27ef2a07ad499d0cc63ca86e2e on remote branch

Change-Id: I9058c6ee8d029d08ec0dc3d2419746b55dca0daf
tree: 9ae4c3963805f734c9eab3e489b5c2b2660b1079
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/