Final bits for V7BETA1

Change-Id: Iee13120aa0df5b586de0c976dd096e88931f414b