am 0f59f9e7: am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989"

* commit '0f59f9e7cf6b501efeb6f33bf8ae289a47b6fbc9':
  Fix Issue 59989