On second thought, make the next version 2.8 instead

Change-Id: I49d7dbb197058271b8da5b40d590dde4cdc577a9
Merge "On second thought, make the next version 2.8 instead"