am 73a09433: Merge "Minor code cleanup to address warnings found by Clang."

* commit '73a0943392a2927dae96195f5293940877f11c05':
  Minor code cleanup to address warnings found by Clang.