am 5dfe9d30: Merge "Add reset to AVD" into mnc-dev

* commit '5dfe9d30b4a5b765cc03907a4be30e2f7d013686':
  Add reset to AVD