Merge "Add reset-all option to adb command" am: 1d23994a5a am: 1e557951be

Change-Id: I9938e3bfe1d063f481c8f16804a821d27ccaad7f