Merge changes I82056aae,I3977680d into oc-dev am: f538757a1d

Change-Id: I074872368b89a8e294a48b01d50c99b02ff8c197