Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c169459bbd  -s ours
am: 2e1f39300b  -s ours

Change-Id: Ib5fad4c1470233853e59b535d6761a0538d57cbb