Merge "Import translations. DO NOT MERGE" into oc-dev am: d20b8bd58d  -s ours
am: fd3a13903f  -s ours

Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5