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

* commit '3e5b01185c08c46b80c395ca1f9c93e45cd98ba5':
  Add StateMachine.removeDeferredMessages()