Merge "Use D8 based the default in build var."
am: dbf5b49e57

Change-Id: Id042ccf51366feeddd878f2026c57dfec9082323