Merge commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b' * commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b': fix build breakage
Merge commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b' * commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b': fix build breakage