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

Change-Id: I69387660e472addf9a0ae5577a841981d8464c0e