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

Change-Id: I11fdcfdc182fd07ba9a8f2dddf87810e0322621e