Merge "Import translations. DO NOT MERGE" into oc-dev
am: 3781f41dda  -s ours

Change-Id: Ibbdf162dabfb5bf7d0706a1febe63033dcb8bb84