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

Change-Id: I798eec2a2a67462d09c648acc8415a1cb1c7e375