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

Change-Id: I3d44017502a4a676a80ded624af6698cffde9fba