[automerger skipped] Import translations. DO NOT MERGE am: 8ffe6cafff  -s ours
am: 55dfc40527  -s ours

Change-Id: Ia29fe69558d99be7aac69029f7fa93d5135dd848