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

* commit '0fbc9d6c5a733766205f6fb33aedd41c9bbb4b0a':