Merge "Update vts_generic_boot_image_test for new init_boot partition"