[automerger skipped] Import translations. DO NOT MERGE am: 2c9562d2f6 -s ours am: 66c52e1bcb -s ours
am skip reason: subject contains skip directive

Change-Id: I2478b7cc0e4be03c1dc6f51d5ccafc429cff1ecc