restart_7k: changes from GT-S6310 release