Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev