[automerger skipped] Import translations. DO NOT MERGE am: 0b7858e7d9  -s ours
am: 9369f59131  -s ours

Change-Id: Ibf293a087017e09941ccbf5967e3689a27ce44bc