Merge "Workaround for USE_D8 not in --dumpvars-mode" am: 44bfeedaa3
am: ad24414dae

Change-Id: Ifa370b15120411f813e15a4210f70ec3fc0b69d6