Bumped to 2.99.7

Change-Id: I1fb6d0a082769f6dd37c25e704660eafe410b218