Merge "userspace reboot: unmount apexes and switch to bootstrap namespace" am: 7051bb3d74
am: 8e6f742942

Change-Id: I140230f0ccfff920086fdc63355ea00a19955fc9