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

Change-Id: I4cbdd3b2d1fff85528566e3b90b4e92b6a71943c