Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
am: 23c0668a3f

Change-Id: Ib9ae218442f87cd3b09520e8c106b95ec2d2a947