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

Change-Id: I292a57fbcae36c74e0489665f3f13733b67a2d27