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

Change-Id: Id4136b467ace512ed708b9659d3bd5089d10dc07