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

* changes:
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c am: 8c01980d am: 95eed5f7 skipped: 85d60d23 am: fdcc979a am: fa184a2b
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c am: 8c01980d am: 95eed5f7 skipped: 85d60d23 am: fdcc979a
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c am: 8c01980d am: 95eed5f7 skipped: 85d60d23
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c am: 8c01980d am: 95eed5f7
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c am: 8c01980d
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c
  DO NOT MERGE Fix OOB read in process_l2cap_cmd