Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 64e0910859  -s ours
am: 32b5920734  -s ours

Change-Id: I737ae370dfd0baf9454f21bc035e5ba5effe3786