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

Change-Id: I2f3c973b770186c297e612123ae5cd28997536ac