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

Change-Id: Id7ce2e2154ae3b01ced96aa45d27b09e1b8166b5