Merge "Disable XOM in init."