am 66a51c70: am da1bc605: am 7a3c8c70: Merge "Fixed memory leak in ExtractEditLayout finish()"

* commit '66a51c7080f26219652f84ae8d10b1e4d63409af':
  Fixed memory leak in ExtractEditLayout finish()