am 30aa53c7: am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit '30aa53c7af22f98233a9c3acbe0efe20a569c8f1':
  Add StateMachine.removeDeferredMessages()