am 9f9632fe: am beb9913b: am ddfb7c66: am cd9ff5cd: am f1d16eed: Merge "Fix DrmServer test for devices that don\'t require drmserver" into mnc-dev

* commit '9f9632fe92de07c6639a521c6761a94845307b40':
  Fix DrmServer test for devices that don't require drmserver