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

Change-Id: I7538f77b09b4931a5b4409f7317663aba17c40bd