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

Change-Id: I04f7f381c26553edc32bbeec157b99f089813acc