Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3945ba7f7b  -s ours
am: 90443216ec  -s ours

Change-Id: If66ad9f3ac609c62937f681ff97870c5a984709e