Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new contact through the dialer app
Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
Merge pull request #17632 from jmcanterafonseca/fix_date_l10n

Bug 987966 - [contacts] placeholder for date fields in add/edit mode is ...
Merge pull request #17519 from crdlc/bug-986047

Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new ...
Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
Revert "Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests"

This reverts commit a968d8cd00fa1f370a2ea7e3994b5bb5391affd7.
Revert "Revert "Merge pull request #17599 from dmarcos/camera-new-features-master""

This reverts commit d9c16d43ea220639982d7aadd2b8e764e9beebe8.

Conflicts:
	build/test/integration/build.test.js
Bug 988118 - Gaia unit test failures on TBPL due to the camera merge