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

* commit 'eab1e21996884fb1918e696efd21c175d96f6195':