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

Change-Id: I1e37deb000da296fbdde8add2d5ab3243bb3953a