Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9b9099ef3b  -s ours
am: dc03550e09  -s ours

Change-Id: I74709e75e7899806c18e0d5b0d6c8f6440e54275