Merge "Updating CmHandleStates using batch operation"