Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 9265f654 am: 1333b5c5
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 9265f654
DO NOT MERGE Add packet length check in smp_proc_master_id