Update to Version 8.0.6

Change-Id: I991477b53594f80ceadb3440ffa9ed7f1f605cd2