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

Change-Id: Ifef9b938c88243a328c5e6de8b40c1e7bc54c6af