Merge "Fix for potential moving GC bugs around proxy class." into mnc-dev