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

am skip reason: subject contains skip directive

Change-Id: Iea8c91e92319ff622286ee7fbc61a959e190bc95