Merge "Parse SMS locally upon error to get message ref"
am: 7a5653599c

Change-Id: I95d354c130697849e6a7953fdf4f089c557f5a4e