Merge "Fix readHardwareBuffer function to correctly handle offset" into oc-dev