Merge "avb: Read partition instead of label instead of GUID"