Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev