Merge "Split concreate and abstract dependencies" into honolulu