Bug 944575 - When exporting a local contact to SIM save the iccContactId in order to align with bug 943234
Merge pull request #14412 from jmcanterafonseca/fix_sim_export

Bug 944575 - When exporting a local contact to SIM save the iccContactId...
Bug 945376: correctly handle the None alert tone setting
(cherry picked from commit 19dba5709ee860750765636f298889bf1441d083)
Merge pull request #13887 from davidflanagan/bug939962

Bug 939962: attempt to reduce memory requirements for saving an edited i...(cherry picked from commit 08d96ee9678bef48a4540470ed96d32e962ff557)
Merge pull request #14474 from davidflanagan/bug939962-v1.2

Merge pull request #13887 from davidflanagan/bug939962
Merge pull request #14475 from davidflanagan/bug945376-v1.2

Bug 945376: correctly handle the None alert tone setting
Bug 945284 - Bump gaiatest version to 0.20. r=dhunt