Merge "Fix and optimize stripForDelivery" into nyc-dev am: 37b3a4a544
am: 336256e1f6

* commit '336256e1f6aba6446f307957ba391c75f3a05eb2':
  Fix and optimize stripForDelivery