Merge "Deprecate bzero"
am: 52fd4ca0a0

* commit '52fd4ca0a0367109500a31a63c5d392372f8f2ad':
  Deprecate bzero