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

Change-Id: If5dcfdf1c84371d86aeb37df131d10605808ad61