Update to version 8.0.7

Change-Id: I3181fbf2dbf9cacac608e3adce77560a333a622a
(cherry picked from commit 820ef8aed722e10a6aa8d5b6f69568ddc4d5dfe6)