Merge changes I901908d9,Iac9835ad into oc-dr1-dev
am: 47aac56746

Change-Id: I6e90dd7720b41c22bd7f87114e3854d028be0346