Merge commit  cherrypicked.