Merge changes I4d2be5d9,I34706201 into oc-dr1-dev
am: c649a9978a  -s ours

Change-Id: I576c2ff37bcf2885f0b126b9d66a3d3d23974146