Merge "Update version of the support lib. DO NOT MERGE."