Merge branch 'v4.21-shared/pdids' into v4.21-armsoc/drivers