Merge "Refactored optimization passes setup."
am: cb90e3a290

Change-Id: Ia82149f76e2242899678edabab859d90ad5880b4