Merge "Don't memset &ptr" am: 77b36c33b7 am: 53e0f96636
am: f3262b319c

Change-Id: I3d7e3a2967d67450c12984a7b96f09cdc0206152