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

am skip reason: subject contains skip directive

Change-Id: Ib8078404328334f007a373508afc4bf8a41ed285