Sync up to 6.0.3.0

Change-Id: Idfe309225a7fdc51c9f65def523383169bfc7bae