am 9c9280d8: Merge "init: get rid of the remaining double mounts"

* commit '9c9280d863d7377858af6e1543ea4ada7af3b0ec':
  init: get rid of the remaining double mounts