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

* commit 'c07701f2764a1c09dc3e8af4321ff0ef66056fee':
  Add StateMachine.removeDeferredMessages()