Fixed the version number, since this is no longer a release candidate.

Change-Id: Ia0c6e9f5dd40e048636614fc1fd1909b32ef80cc
Merge "Fixed the version number, since this is no longer a release candidate." into REL1_21