Merge "Fix bugs in boot HAL VTS test"