Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 7e3f498034  -s ours

Change-Id: I58269033b0b7197f5da1637a073e20687b021dde