Merge "Set safe mode alarm when validation reports NOT_VALID"