Use cm's overlay, and cm's overlay

Change-Id: I227bdd147afc1182ee46bc11ebf115242cfd6eb2