am 9a1b3754: am 9fad3f3d: Merge "Avoid testSetKeepUpdated to be scheduling dependant" into gingerbread

* commit '9a1b37542c719cad1a5d133510d02a98a5cbcb11':
  Avoid testSetKeepUpdated to be scheduling dependant