Revert "Update overlay to match what is in RC"

This reverts commit b3eef38d7a86fcff0d0c58ef8235e670441c43ba.


Change-Id: I21e894aa3144cbba521aae6345b5029807696e9f
Signed-off-by: doc <doc.divxm@gmail.com>