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

* commit '55db2ebca952fa9380f1c1606360bbc276c4d9be':