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

* commit '8ae14d8ed082b1d479b8488831d74acb06cd31c8':
  Fix for potential moving GC bugs around proxy class.