Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: e71e7649 am: fa02e30d
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: e71e7649
DO NOT MERGE Fix unexpected behavior in smp_sm_event