Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2174056518  -s ours
am: 659cbdf99f  -s ours

Change-Id: I86faa00d3b38a81f63d98458fdfb2f1d8889eb7b