Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5  -s ours
am: a56ea23d9c  -s ours

Change-Id: Ia3432072146b9fd6abac4a83ce3869ead70ff600