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

Change-Id: I0217358393d1ac6888cb5ef130a2e20ec3861c8c