Update for use with our repos

Change-Id: If8633d410346cbcac298ec6203af237867248028