Merge "NFC: Submit the missing pieces of previous commit to fix build."