Merge "update sim activation state for otasp"