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

Change-Id: I2cd255fd2f265718df096d05f3c8a67c78662c58