Merge "Fixed an issue where the message could be empty" into pi-dev
am: 99168a6371

Change-Id: I848486310a74b37dcac41bf81a5746ca15dc0d7d