Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 0555bb3003  -s ours
am: 6abeadf69d  -s ours

Change-Id: If0aa1679eb6a09080575ba4eb4b39833e04a8e5f