[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours am: 5c90432dc1 -s ours
am: eeca546428 -s ours
am skip reason: subject contains skip directive

Change-Id: Id1d0ad08693f87b8433bb6707b10a10f976442ab