am 7aa9fb78: Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread

* commit '7aa9fb78e6636c301bb6c75c5e6e020e51552ba3':
  CTS: Fixes a possible "out of memory" exception