Cherry pick in horizon fix for bootstrap upgrade

Change-Id: Ifcd83aa8c01cac41b62f3e18729230bbcbad796e