AI 144833: am: CL 144830 Bringing luni down to 15 broken tests. Not perfect,
  but an improvement.
  Original author: jorgp
  Merged from: //branches/cupcake/...

Automated import of CL 144833
35 files changed