Merge changes from topic "userspace-reboot-bootstrap-namespace" am: 3efe4c37ea

Change-Id: I3d9b641eb81a2ceb247a543fc02ed01003d4474f