Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9-mnc-dev" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704 am: d3886631 am: ebfa03d4 skipped: f2915940 am: 5024b7b9 am: af58d2f9 am: 080b6044
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704 am: d3886631 am: ebfa03d4 skipped: f2915940 am: 5024b7b9 am: af58d2f9
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704 am: d3886631 am: ebfa03d4 skipped: f2915940 am: 5024b7b9
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704 am: d3886631 am: ebfa03d4 skipped: f2915940
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704 am: d3886631 am: ebfa03d4
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704 am: d3886631
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 5934e704
  DO NOT MERGE Fix OOB read in process_l2cap_cmd