Merge "Don't process broadcasts until really ready." into pi-dev am: fcc07b53fa
am: 074eb69824

Change-Id: I8da3b982cc6dd6f855d57bf3bf3f076f14543b01