Pushed to 2.99.6

Change-Id: Ifccad6c05eacaf181adebf4eb59d22f42bae1ac3