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

* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
  Overlay java files Issue 3370836