re-add changes for AppMessage in HelloWorld.c
fix automerge issues