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

Change-Id: I1b125922c20143faeaf08d4a56a3b5e177900d84