Merge "SharedMemory API changes" into oc-mr1-dev