Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 5b5853fd3f  -s ours am: d98dbbec17  -s ours
am: 288f177fbc  -s ours

Change-Id: I6d70b3ae3ce57d919551a90d3c2e0269c4d3ca97