Update dependancies

Change-Id: I51e12c211142543b22167b8217d2585a028b9956
Merge "Update dependancies" into kk