Add constraints resolution for dependencies am: b9f20d1929
am: c06cf1c472

Change-Id: Ia1476a23cc5e05804aa2ea6490c235c9b309c9d2