Update for 4.0.4

Bug 5856795

Change-Id: If525ef817884089c8a3e86e991b295cb3e479360
1 file changed