Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2ebc49de87  -s ours
am: 721e972633  -s ours

Change-Id: Ia1d0f2fef183cc0f81902bbf5c5a229d5b6436b4