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

Change-Id: I06ccad46bfffe67c2a2f4f284c2d4b0f3fd39f27