Merge "Face VHAL for user build" into main