Merge "Fix AVD memory leak" into oc-dev