Merge "verify system and vendor image together before patching." into lmp-mr1-dev