Change to version 8.0.4

Change-Id: I9cdbc4d9467c61b6dba023d2df59c3e9e62a2af9