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

Change-Id: Ia2046b27fe4d8b355ddc88bc3be50dd2340fcac7