Merge "Bug-8187: call home throwing exception on startup"