cherry oick overlay stuff

Change-Id: I6484d174121a4bd22af14497aa185930d5431764