Make it Static

Change-Id: Ic132f5c38d6605e4a27f436f0ecdfd07ba679569