Merge "Remove blocking from SM before boot completed." into klp-dev