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

Change-Id: I1464cf2e842dc2c9751a6e801a714cd9234fc563