inc: round 1 of dependencies changes

Change-Id: Ic91b210f3631b8b45e0a5c95af8b25037b0f42cb