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

Change-Id: I8dfc0da75cede32a4161760eeca34e84dd81c406