am c1ff203d: am 2066cd5e: am 9c051c78: Merge "Incorporated reviewer\'s comment on the Unit tests."

* commit 'c1ff203de7c919ff8b6d665dfadca3662a3acc93':
  Incorporated reviewer's comment on the Unit tests.