Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 0b82b53b82  -s ours am: 66299ffce0  -s ours
am: 09b4c6f433  -s ours

Change-Id: I0ff07e492b22097bb349e5bb366d32f21335de7f