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

Change-Id: If46ff7739aae13d118f597f4838c65924ce083f4