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

Change-Id: Ifaa8c6937ab50945b49055d7b19f81bf09c78a9e