Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2d95320d7b  -s ours
am: 8a40e3ec31  -s ours

Change-Id: I01730283d1a7f2b3741309a63f31c5b8f7409844