Merge changes from topic "update_evs"

* changes:
  Modify logcat messages
  Follow-up EVS changes for Hawk