Merge "Use flag to control the restart period value." into tm-dev