[automerger skipped] Import translations. DO NOT MERGE am: 52b23c5d89  -s ours
am: 7816fe6460  -s ours

Change-Id: I085720a0ab8aaf6aa7c6713987aceff44c1eadf8