Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ba3347b48a  -s ours
am: 2e3be621b6  -s ours

Change-Id: I090819b1cae93821cb2b9a135a511724813ed724