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

Change-Id: Ia55b3b9666b2683e880e07071b53645ba309a57c