version bump to 6.0.4

Change-Id: I0b5ede31a99f64e5e2d99aea5f625aa4a4f26f80
Merge "version bump to 6.0.4" into rc