am 2bc22b74: am c0ada5f6: Merge "Handle TransactionTooLargeException in ServicePermsTest" into klp-modular-dev

* commit '2bc22b74307a4928ca6a2a7f196071733803b69e':
  Handle TransactionTooLargeException in ServicePermsTest