am cdece3f1: Merge change 5678 into donut

Merge commit 'cdece3f14d9ea083e7cec3c696542206232c87cc'

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