Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev

* changes:
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: fb216852 am: c0705764 am: b833c798 am: 4bfa63c8 skipped: dc214fd4
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: fb216852 am: c0705764 am: b833c798 am: 4bfa63c8
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: fb216852 am: c0705764 am: b833c798
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: fb216852 am: c0705764
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: fb216852
  DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf