Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3231634e2b  -s ours
am: 62ee030f38  -s ours

Change-Id: I5e5a7af38854b1d5a5c15aa5fdcb128323e96bb4