Updates for 2.7-rc2-507-g1e7090b

Change-Id: I49844cfae830064b496ac062cb5eda8d0583f0a4