Merge "Offer to wait until broadcasts have drained." into oc-dev
am: 6f4aab2c01

Change-Id: Id6045353ed2293ece7ecdb7697904fa7993a7ed3