Merge "Use D8 based the default in build var."