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

Change-Id: I9b79626767a3cf4c5332478cbbde6950ca00c005