Add constraints resolution for dependencies
am: b9f20d1929

Change-Id: I7444d7025e31e849b59bd1d48f7919bfa80fb7b2