6.0.4.5

Change-Id: I4c67db56928243aa75db950c70ad80483a133fec