Updates for 2.7-rc2-505-g7502a46

Change-Id: I7d61a176e279ce1238b899183659152eb537339e