Merge "Remove slices from buffers" into oc-dev am: 5c91f12131
am: dbdc0fc329

Change-Id: I4f9604a67246849d84b7bf3a2493ffbdd620917e