Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 7061535ce6  -s ours am: 715da3530a  -s ours
am: 715aa961ba  -s ours

Change-Id: Id4d9a383f1fdb4f0721cfeca4a98d0b42a4173d4