Merge "Don't throw TransactionTooLargeException for small payloads" into mnc-dev