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

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