Merge "init: only allowed to transition to logpersist or logd"