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

Change-Id: I46e008325a0a49ed8b5e6b9abe106d96f009e09c