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

Change-Id: I09e9baef932326a81e31c2a9792939831255990d