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

Change-Id: Ie1e522eba5b85e6221580525a35e1723626f9ba5