am e995ae93: am 1a9b5b61: am d3493fab: Merge "Switch RSForEachExpandPass to use MetadataExtractor."

* commit 'e995ae93aa5ed062aede5df96f809cca7de3037c':
  Switch RSForEachExpandPass to use MetadataExtractor.