Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1058478d5b  -s ours am: c29576d8ab  -s ours
am: 2dcedc156a  -s ours

Change-Id: I03997e6ac545f54549412b0836a7b22dbb9bb054