Merge change 5678 into donut

* changes:
  ADT #1843641: fix 'Extract string from layout creates blank string'