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

Change-Id: Ic76163052cc3d38d550830e6da9cbc2c4ad8147b