[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e
am: dbea58fe4b  -s ours

Change-Id: Ic72202f29a2a0101edfe89bce777b9a514296ebd