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

Change-Id: I3bac90d14d3197def5be546ff1d75d266ff1455f