[automerger skipped] Import translations. DO NOT MERGE am: 01a0bdc06a  -s ours
am: 54a8f21d58  -s ours

Change-Id: I1cd35c52c30f3c9c769a41ced47e2c939b9af4ca