Updating dependencies

Change-Id: Ia7857f53c60ec5268bcb1434f216d3ec0aa229a2
Merge "Updating dependencies"