Merge "Reduce memory usage by other deps in scheduler."
am: c0417890a7

Change-Id: Ifbb51183920db7117ecd8e03ce4c02d0ac3ec0d3