Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81  -s ours am: 0c411c32cd  -s ours
am: ff70153aa4  -s ours

Change-Id: I5e5581e6432da36638b2092c9dbef4f40ddc1c1b