[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be am: d9af1fff am: f5960e96 Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca