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

Change-Id: I8f9d9ffb739e573f2917479b346b2d613e10ed76