Merge "Update-ability: Refactor BT alert to remove internal AlertController dependency"