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

Change-Id: Ie48fc3bcd9eaa2dfb7d880e42dace2711fbf6f59