[automerger skipped] Merge "Parse SMS locally upon error to get message ref" am: 7a5653599c am: 06cdcab7ba  -s ours
am: 1a7aec528b  -s ours

Change-Id: I3136490811eddadbec6ad3605c74105b76c4b37d