Update to version 8.0.7

Change-Id: I3181fbf2dbf9cacac608e3adce77560a333a622a