Updating based on review comments, compile tests
am: fb58c0d045

* commit 'fb58c0d045ac176a33b4af4da330599eb72c8a9f':
  Updating based on review comments, compile tests