Merge "Revert "Split editcascadeprotected permission from protect permission""