Really fix admin cidr issue

Change-Id: I2019c1237d4cc2fd821e5d92a876800dc52bfb69