Merge "Fix exception on MediaDrm invalid property access"