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

* commit '2674aef29b462cbed2af4c7e426f1ddb36bb5059':
  Avoid testSetKeepUpdated to be scheduling dependant