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

Change-Id: Ifca4d60381bfa6a02231fffc129613ee2d85d80a