Merge "Broadcast only if boot complete" into oc-dr1-dev