am: 37b3a4a544 * commit '37b3a4a5440f489f65941b8182b33c34f86ffc1d': Fix and optimize stripForDelivery
37b3a4a544