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

Change-Id: Ib5f641f37e73fc6b236fe90c229bb3855025375c