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

Change-Id: Ia1dd108b926fa3701fff182fe74fae59dcc52783