Patch application.

Change-Id: Id7779bf371dc6bd6aa40152d1cfce884584dd77e
First Vektor Commit

Change-Id: Ic4843d463116171d7748be52360cb5973f25cb03