Mirrors C8 with C7. Removes C8 upgrade (not possible from Stein). Change-Id: Ibed60506fc105731fe1003733a33871ae6953380