[automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 am: 2053a11236  -s ours am: ed50f647f7  -s ours am: b0720ae3c0  -s ours am: 88f1cb52bd  -s ours
am: 24055162f1  -s ours

Change-Id: I50ca0bd4043bc3abed050c9ad3358ee0793a55d7