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

Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172