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

Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c