Merge "Enable D8 by default." am: a867dfa71c am: d46624b4d8
am: 209e7bf321

Change-Id: Ie15ea435e30075aa572c508431ec214b6ec3f0e0