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

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