Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fab6fa3164  -s ours
am: 26b10fc03e  -s ours

Change-Id: Ia55477d58f8decb08faf38e6cbaeaccd8e82cef6