Prepare release 5.0.4

Change-Id: I8cc713bce7eb665a8c6dd43cf12d454c24797c60