Merge "Disable XOM in init." am: d98acb0d4a am: 99bcaff566
am: 96a6800ddd

Change-Id: Ib4c4ddeb529a800375ac6c26658a6c6a120519bb