CM's overlays for now

Change-Id: Ibd08e811c409c8bb87df339218141c2e99c648a5
Merge remote-tracking branch 'vanir/L5' into HEAD