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