ae44659f30
Also refactor a few methods and improve logging. Change-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c
Also refactor a few methods and improve logging. Change-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c