Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread