Merge HALO
Change-Id: Ie75b456f8da064c04ce64b80e7e435c1fba7dc03