Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149 am: bbc56855bd
am: e3a9f9b4e6

Change-Id: Iafc3a73f73b2d9a1e76b6a819632cfbeb504c209