Merge "Avoid TransactionTooLargeException in onSaveInstanceState()" am: ced39f68d3
am: 4d89ee72a9

Change-Id: I241329888c265cffe4c6fb5edb10520d9476b57b