8203637: Fix Sources

Reviewed-by: hannesw, sundar
62 files changed