am 0544d059: Merge "DRM Framework bug fixes."

* commit '0544d05990c0f43a143e98e71f7fc60277872806':
  DRM Framework bug fixes.