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

Change-Id: If8ae0b33ababcad202f1413032772182acb73de3