Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev