Merge 2909e058d1ab8e51de73e514a2148dba9036edc0 on remote branch

Change-Id: I53fb4cebe9bb154c61fd178a7b8246926d1dc13b
tree: 7cb71d8f69ced905ab2542556365267241dd2199
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/