am cdf9fbbb: (-s ours) am fd3ff790: Merge "DO NOT MERGE:backport test imrpovements from newer platform" into gingerbread

* commit 'cdf9fbbb6185c470fdb40b54003e6fe02f49dda4':
  DO NOT MERGE:backport test imrpovements from newer platform