am a0cca8e6: (-s ours) am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev

* commit 'a0cca8e66ac124c5d78fe35e10ece83c5314734b':
  DO NOT MERGE Fix the syntax error in the edify script generator