am 6374a979: am a46fa441: Merge "Also Skip DRM setup on devices that don\'t have DRM" into klp-modular-dev

* commit '6374a97996476fb5353d069441c830834d4aece9':
  Also Skip DRM setup on devices that don't have DRM