Merge "Dependency cleanup for snapshot .bp"