[automerger skipped] Import translations. DO NOT MERGE
am: 690a287f6c -s ours
am skip reason: subject contains skip directive

Change-Id: I973882c5540b56613113707da3a99daf315c4a98