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

Change-Id: I072b7f8f6e320f2339b1b134193aabc2c654604c