update 4.0.4

Change-Id: I499db2911a521dac13c564383df7496016a5887c