am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb

* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
  Overlay java files Issue 3370836