Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 50dcc59875  -s ours
am: 4bb1790956  -s ours

Change-Id: Ia5560c6b19d1277fc4eb178aad0f8e969cb5d0b9