changing dependency chain

Change-Id: I02f05547c401a7ac6d3bfb5e0cc2c2024341578c
Merge "changing dependency chain" into production