Merge pull request #13323 from bobsilverberg/cp925850

Bug 925850 - Modify the test_dialer_make_call assertion to handle long phone numbers
Bug 934230 - [v1.2] Update all manifest files to be in line with master