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

Change-Id: Ia989ac0276931821c9e2c01480a4c83c5b1517b1