Merge "init: add class_restart" am: 8678872a00
am: ee7137208e

Change-Id: I374ccbdf12eb2dc797ce3d6cc815983730ca5fcd