version bump to 6.0.2

Change-Id: I2c362b76962046ffdf6d1fac352de49c0f2608c7
Merge "version bump to 6.0.2" into rc