[automerger skipped] Import translations. DO NOT MERGE
am: fa32f62266  -s ours

Change-Id: Icd62dc7061020b3334409a5946f6d552ed9fc37a