[automerger skipped] Import translations. DO NOT MERGE am: 4a15b39992  -s ours
am: 1a13186e77  -s ours

Change-Id: Iaa8ac49dafdbbcbd92185a04243e50e21928f342