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

Change-Id: I07fc3a494ca2ab9e5585febd187c08073483c297