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

Change-Id: I3dab225ed98c0d0db033b6c39d4f6589aa3d66da