DO NOT MERGE ANYWHERE: Remove several memset() calls which overwrote buffers initialized in buf_mgr_init().  Affects 6.0 only.
am: daefcde2ed  -s ours

Change-Id: Iea04b97570d1ba8098fc034f2b6ad893b79f0ec0