Merge "Update APIs" into go1.16