[automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours am: 5c56a5e691 -s ours
am: c40d399613 -s ours
am skip reason: subject contains skip directive

Change-Id: I14631fcef87a92250d680d83b1b6e2c84bde83c8