Merge "Revert "Enable D8 by default."" am: bc29d906bc
am: 81e4d14cc7

Change-Id: I2a56f958ea8083db4cb97231a1224a802c8ee382