Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7c2a12b658  -s ours

Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d