Merge "Import translations. DO NOT MERGE" into oc-dev am: b212441814  -s ours
am: 5059b148d1  -s ours

Change-Id: Ie53d2063d7ea8a0c1e9e1a28ccaf6a71f53db994