Merge "Import translations. DO NOT MERGE" into oc-dev am: 76be6a7a6b  -s ours
am: 3486ad7d4f  -s ours

Change-Id: I7935ddf94e29577cdb8741c23b335d4f955be937