Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 579040481b  -s ours
am: 1fe90c9cf9  -s ours

Change-Id: I6bab66f90fa59eaf747e96c0343cd9da4b7b7292