Switch to my forks

Change-Id: Ic10ca0016433ae2659b64527af6893196806e912