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

Change-Id: I210aa33e29de915dee905ca5306371a702225693