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

Change-Id: I2ced2f5a656e6eab6eb01b2a78ba3c0707ecd32b