Merge "Add TestStableBufferIdAndHardwareBuffer" into oc-mr1-dev