Merge "Disable XOM in init."
am: d98acb0d4a

Change-Id: I4e05a2aa3330f467a075f843390236d31dba6316