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

Change-Id: I27b6ad9cee42fc54964a37d7bff32c041ecf01ad