Merge "Add reset to AVD" into mnc-dev