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

Change-Id: Id83d9585354afe2d5d8a1a326720a9b2f8fbf559