Bump version to 6.0.1

Change-Id: I39df2c62e031dfaf6c92c07d46dc094b0d4ee945
Merge "Bump version to 6.0.1" into stable/6.0