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

Change-Id: I0cd5c2cac5190abf33d2dc56ebaf4259d358caad