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

Change-Id: Ic2b6828eef172d24a6d14eea417a794f238c92a6