Update dependency versions

Change-Id: Ieb6088d9dbfdccb9e0beecd6e5d8d7276d48fe13
Merge "Update dependency versions"