[automerger skipped] Import translations. DO NOT MERGE
am: 32e06712e6  -s ours

Change-Id: I70e4816960747499a23ad3084553ee5ec6e563c9