Merge "Import translations. DO NOT MERGE" into oc-dev am: 53df9f871a  -s ours
am: 058a4e1844  -s ours

Change-Id: Ia34b4120d4a8bb5bb6de042f55e38a924d8ce6c5