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

Change-Id: Idab1e4edff135cf0f426aa6150e30f612e43937b