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

Change-Id: Ia15a920f9a1af9e11d12a7fdd87845c2d27d72d2