Merge commit '4f55bd5321b72491d4eff396e4928e9ab0706735'
Note it does not update build infrastructure.