Story 1405: Update messages

Overhaul all our messages

In process fix following bugs:
Bug: 54795
Bug: 56437
Change-Id: I827ac7894db534fc3bf3732516117f01f41fda8e
Merge "Story 1405: Update messages"