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

Change-Id: I2b728aa8bd33fb960a0da2ecf99ea0ff44f9ca8d