Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 514c1162fe  -s ours
am: 7d8aa66330  -s ours

Change-Id: I953374983b3d207e7083a5399b42a7366f223493