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

Change-Id: Ife6c221e1e4e8181d4aab763cf758751c4af7d2a