am f4fbdfa5: Update current.xml after review comments.

Merge commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f'

* commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f':
  Update current.xml after review comments.