Prepare release 5.0.4

Change-Id: I5ac9bc042dc7d802ad0df7dca18cde0202239e3c