Update overlay to match what is in RC

Change-Id: I4522cfe2a12fe795fe34292d4fa14df6be617290