Merge changes I33ad185f,I5fc2d727 into oc-dev
am: 1b0895300f

Change-Id: I8ba213f5160c6e5557e2fc20df92efc4f07d5056