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

Change-Id: Iac438aabfa9d368ac5df17ea68321605e5666f2b