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

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