[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144  -s ours am: bf6bbefe57  -s ours am: c1a9ad2a19  -s ours am: 648f0b4c44  -s ours
am: 1beddd17c3  -s ours

Change-Id: I498947d7b1119c44028c66f38f2b453518ae1f07