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

Change-Id: I7bcaf60003d7d249bc4f49739f8ad3c39b726a46