Merge "fixed CdmaSmsAddress parser" am: b00f00e74b
am: c8ec8a5e56

Change-Id: Id3830aaea1037b61ecc385715708427c84030206