Mark as const / static

Change-Id: Ia41b8cc062fc1e7c2cf0b8ba64c303919448ef06