am 0c0585ab: am c27a31e3: Merge "Add unit test for issue 64563"

* commit '0c0585ab5bf37be11a2392fbd75528056e6e8617':
  Add unit test for issue 64563