Merge "Allow empty value for dm-verity and verified boot state" into pi-dev