Updating for 2.6-rc0-76-g52fb5ae

Change-Id: I508690d2418484d0846f216e1a3aeac54515c56f