am a9c2ef84: (-s ours) am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread

Merge commit 'a9c2ef8464f6678c21e0cdf9f4cd8f4e1fd20d2e'

* commit 'a9c2ef8464f6678c21e0cdf9f4cd8f4e1fd20d2e':
  fix start driver for corner cases DO NOT MERGE