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

Change-Id: I283785c7387e914dda8952cd338aa452d686f39e