Merge "Revert "Disable XOM in init."" am: 4cafb54481
am: 3da6ff1ff4

Change-Id: Iea09f1fc2c3dae765472976ec90054bb2e6410ba