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

* commit '92fb534298dc2d7e91e6dc1a8d8454b7f3f173f8':
  Add StateMachine.removeDeferredMessages()