[automerger skipped] Rely on compiler to zero out structs.
am: 16786a76b2 -s ours
am skip reason: change_id I96e4bea47f99e00ef33cfce74621e5869b1ff3d7 with SHA1 e16253572c is in history

Change-Id: I66b855a31ad9685b4866e3945d21a232288e304d