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

Change-Id: I5b78e73fc5fb303b739ef85788866f1c95c6195b