Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 420ae05329  -s ours
am: 52ff2bf2a1  -s ours

Change-Id: I0384a49cb23e1f48509582e71909f7245482ec15