Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 54cfee17 am: 4379991b
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 54cfee17
DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event