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

Change-Id: I71a1720bd4a72fd5e9828aede6550b057a6bbe36