Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 432f3317f8  -s ours am: e583a3c853  -s ours
am: 1b2948ad62  -s ours

Change-Id: I1417fb4d8a8ef6c53c230b07a04d347b22afe524