Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 9d3c51d66f  -s ours
am: cee545ed44  -s ours

Change-Id: Id25b2ed05738007f3ba990b9deb527ccaf15448c