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

Change-Id: Ifcc04dff7f6f0515fb44021c4ccaa6e19dc271c1