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