6.0.4.2

Change-Id: If31be58f4ecb9ab95cca7af0cde5ce32f25c8573