Merge change 4905 into donut

* changes:
  Address review comment in previous patch sets.