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

Change-Id: Ib6c69380847dd5bd89e62495c00abe78227d632d