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

Change-Id: I27550eed00c81177523d0adbee7d01d328714653