Merge "Revert^2 "Exec_start derive_classpath on post-fs-data.""