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

Change-Id: Ibb60f477d5e4338807999cd42bfe87e0dfd6c95d