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

Change-Id: Ic2c53def15379c202175a06b457b0a77b8872ddf