[automerger skipped] Import translations. DO NOT MERGE am: b251eda396  -s ours
am: dc29cd810f  -s ours

Change-Id: I2cac50818ce2c3b10f9c6c5652f02ea0d71d4596