Merge changes I44108877,I25c6b325,Ib223620d into oc-dev am: 846a21dd61

Change-Id: I7ed2cf1f8863a097ac8ffddf131bc84e5fbf99fc