[automerger skipped] Import translations. DO NOT MERGE am: 5759b04e94  -s ours
am: 71544f6fb6  -s ours

Change-Id: Iffa20aa77cfb28365dd98100b76a7544eecf70a1