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

Change-Id: Ib512c45c735b6259220d2e0934fa6132f533d421