Merge "Remove ScopedBytes use" am: 422fa22456
am: 7c58021208

Change-Id: I8c552ea28fa7fb5577a7932c599a0f615df28125