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

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