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

Change-Id: Ie6758133479cfb44940dc63719595362d407c61e