Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev