Rely on compiler to zero out structs. am: 6dc48681df
am: a2c71652e7

Change-Id: I26c6e93869e1406bdbdd94846d907dd3b0dbb710