Ready for HALO!

Change-Id: I16824183fb63a81ad557506d373d74ad424d64bd