Merge "Removing unused function reset()" am: 5a053ab455
am: c8c38ccaa4

Change-Id: Ib41fc76d56397fcc456b313dcae4460077347418