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

Change-Id: I610689be2159124e66b739307ed033e4d367abe6