Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae  -s ours
am: 4d00a9512a  -s ours

Change-Id: I30da215979e10c5ea3ad63cc24c46dfe1a0a9ceb