am fd3ff790: Merge "DO NOT MERGE:backport test imrpovements from newer platform" into gingerbread

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