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

Change-Id: I087b9c5b1524db8692a51d6d648fbcc4391d6d21