Changes to support scheduling advertisement using VMAP and VAST

Changes up to CL73397