Constraints update: I672b9c02669664b8b10b01eb8f85893fbe166cf0 Change-Id: I28babf71612d95f6d9c9b9a88832ddb48602c65a