Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bbfc26ecb  -s ours am: f83dc01d39  -s ours
am: bca7ad5004  -s ours

Change-Id: I331470f548e33d184cb91b5dd5fd8bfc3b5257df