[automerger skipped] Import translations. DO NOT MERGE am: 20fa188802  -s ours
am: 219ffa7e4e  -s ours

Change-Id: I56140bf865d34993a419e231aed874d3b81d4ce0