Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9b312998e4  -s ours
am: 48b33e70c1  -s ours

Change-Id: I31cb152c7349e3ae57607ea516b43c098a7ce9ba