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

Change-Id: I843d91ceb573e64f8af060a921c6c9fcc35cdeb3