[automerger skipped] Import translations. DO NOT MERGE am: 1a84e070b3  -s ours
am: 7c6679fac0  -s ours

Change-Id: Ib4dc327c3c76a7d59fbe9b892340d6b546a3ac2f