am a3ae08b1: am 49ffc520: Merge "Add fr_CA to l10n builds Bug: 7579865" into jb-mr2-dev

* commit 'a3ae08b134f7110b1481fa82be401df70e41f6b0':
  Add fr_CA to l10n builds Bug: 7579865