Merge "SharedMemory API changes" into oc-mr1-dev am: edf3384307
am: 20933d0454

Change-Id: I08d5eb7c5cf99c0af6f94a5f88af0ca8328c34f2