am 422a7208: am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)

* commit '422a7208d186ce9af4a9a59466a9773179f844fd':
  Bit of code cleanup (issue 11648206)