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

Change-Id: I20961b631c405f7ce28af7db7cc2755a90a70389