Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am: cd2cc9aa9b
am: d515b124f7

* commit 'd515b124f7f966a3e4725dc6f6179ade869df636':
  Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()