Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev
am: 043e60f5e4

Change-Id: I67d2a04e767198e2af7217e4e723025daf81d16e