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

Change-Id: Ie95fe2b19ada7db94e0e9147ce6b4f7a4acc5a64