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

Change-Id: Id90f348bb753c503df3823c2017d258ecb6f15cb