Make restart runner and info util more dependable

Change-Id: I59033d7ed594735623f917ad5696700d79339b01