Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL" am: 1e8399f1ab
am: 5f2441c343

Change-Id: Ifa75e5d760ebc7f7b8aa5de6ec8f3f1002fe50ae