Minor changes to streamline the code and add --resume option

Bug: 137798757
Test: compile
Change-Id: I7f1fe106f0520f9e419ef251dcad38d764dacd18
1 file changed