Merge "Broadcast only if boot complete" into oc-dr1-dev am: b60c48a6a2
am: 4501186a6c

Change-Id: Ib65430aa0ff6a115fcd867fc6c8c0e4e7d9a03fc