Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4e9a4d81d2  -s ours
am: 9faa483116  -s ours

Change-Id: Ia597a61df6d1909afd026b26cc3fc5df26db6ed2