Merge "Parse SMS locally upon error to get message ref" into pi-dev
am: 2d108c3747

Change-Id: I3b75da909f1f07125c5696f7f9e525736732f3c1