more dep work

Change-Id: I820e86a68ff9f645c0cef2b6a5a4471a756b79b7