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

Change-Id: Iaaaefee06a63d4f22f7cde14d4dd61122435156b