[automerger skipped] Import translations. DO NOT MERGE
am: 790e02ac33  -s ours

Change-Id: Ifd753220f6643478d953148db3586e46694b2c9f