Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a  -s ours
am: 5386943cf2  -s ours

Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab