Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424  -s ours
am: 8a6ee58aa0  -s ours

Change-Id: Ib7fab968af53d8cc0986ee18f1e0a7cd6c27dde2