Merge "Update version of tools to be 22.0.5" into tools_r22