Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread