Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: aaded1bd47  -s ours
am: 624e006d0e  -s ours

Change-Id: I04c2a7bbbdd63ecbc1b91b761f5b9cbf358446ff