Merge "Call defuse even when restrictions bundle is empty" into nyc-dev