Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b  -s ours am: 71713e846c  -s ours
am: 333a0747a1  -s ours

Change-Id: Ic7d6636562d0c450ed1548415b5ba523636291f6