Merge "Remove ScopedBytes use"
am: 422fa22456

Change-Id: I2fcd6bc031e146d34f322476e2850e1773ea4cb5