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

Change-Id: Ib1e67bd2313fe62b99abb44723d5654195cc227a