Merge "Add missing reset() calls"
am: 37ee306168

Change-Id: Ia68a316f7118bcfb43b3d02f377eb798147c7411