[automerger skipped] Import translations. DO NOT MERGE am: f6418b3f90 -s ours am: 055f833e80 -s ours

am skip reason: subject contains skip directive

Change-Id: I5fe3ccd0e335720e274dda89b89170e8d08ce274