c7e3f6c6fd
Motivation: Cherry-pick of c7e3f6c6fd went wrong. Modifications: - Fix comiple error Result: Build completes.