Merge "Import translations. DO NOT MERGE" into oc-dev am: d67a6d7176  -s ours
am: 3f52ee79d7  -s ours

Change-Id: I02fddb1b1380320d4be87eed730a245d58fe3ba0