Switch to stable/4.0 branches

Change-Id: Ic3f81bbb5fe49f419a971fbb0c4912c452e6bc19