Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: aac5c0e427  -s ours
am: 5678f94efb  -s ours

Change-Id: I14de2c2c83862efda9a087a11f663a7b443d0188