[automerger skipped] Import translations. DO NOT MERGE am: f40ab6f500  -s ours
am: 95033aca48  -s ours

Change-Id: I9530801c90aedea1d2e1bc54209f018fd909ca25