[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 am: cbaf1505a0  -s ours am: 82f5bd65de  -s ours am: 0a47e3fafe  -s ours
am: 899eceb2e8  -s ours

Change-Id: Ie7a29705442b0a8c1675879a19c6d25d38ab9817