Merge "Fix USE_D8 in conjunction with USE_D8_BY_DEFAULT" am: 656c768d am: 13643546 am: 2f8316bd am: e83b7131 Change-Id: I1b26d729a38a3b12b172b461862bc7080bb3a162