Merge changes I5762a98d,I39f4e015 into oc-dev
am: c56b1d3c98

Change-Id: I4e6931609d4a3fc8a0c80b58f9d279f1f65d6a10