Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d16bcef26  -s ours
am: b07d972011  -s ours

Change-Id: I01af0181ba1ebdcc1101f4a6234c0d29459a50a2