Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 0b11f3e734  -s ours
am: 828550d8c7  -s ours

Change-Id: Id6ff455949eace4abdb6c8b31ac19336b222ebe3