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

Change-Id: I633619458f6550422a934c5c449fb33b5ea3f061