Merge "Overlay java files Issue 3370836" into honeycomb