This update brings the partner repo in sync with the internal repo's commit 040460be8b9556a699a6cd3813c88ce710f68146.