am 34ac23dc: Merge "Address some GC comments"

* commit '34ac23dc965bf6ca24dd2e9bb115f66ff1fc191e':
  Address some GC comments