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

Change-Id: Iec7a144b9a340c0714cc9748d8d8cfc2a9c0c020