am eb76bc4c: (-s ours) am 131bcb0f: Merge "Revert "Remove unnecessary metadata duplication in Script*.""

* commit 'eb76bc4cad531ee2c1bec8532dc99c920730ace1':
  Revert "Remove unnecessary metadata duplication in Script*."