Overlay java files Issue 3370836

Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
4 files changed