Update overlay and SPN

Change-Id: Idec29cc0b9217cd32224eb1427242a17886c8a80