Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 249c45391e  -s ours

Change-Id: I6181ef920c9baab4fa905b3d8772083e4f0bc650