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

Change-Id: Ia442a9a97cda4c07fb041db184be9cb0247350e4