Merge "Expose SmsCbLocation and SmsCbMessage constructors"