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

Change-Id: I8022a841defd381d9b67088271d088ad559d24e1