Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 56b37be1c9  -s ours am: 375ee4625d  -s ours
am: 44a8166dd5  -s ours

Change-Id: I1fb4558aad8a8347faeac518e5f210cd9a380bfb