Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev
am: 68e459918a

Change-Id: Id7fc79cb3aa02889c73efa27f0db9262c3ea7c12