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

Change-Id: Iaa69efb2a15b57ed09baaed3acf1c33f235391cc