Merge "bliss: Cleanup vendor" into q10