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

* commit '3b4c2c982ef4ac681929678288ce042e4c0a5be6':
  Fix Issue 59989