version bump to 6.0.5

Change-Id: I145892d8534da23067510259f973afc75649595e
Merge "version bump to 6.0.5"