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

Change-Id: I2b941d42c662dc55b203742616f6cd19d46b4977