[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours am: ce22e01572 -s ours
am: f1f45f8be9 -s ours
am skip reason: subject contains skip directive

Change-Id: Icf5a0a472da082c1b6fe07cac70b4b7e31be4818