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

Change-Id: I82210a83455d828cd4fda585127dac791c67235e