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

Change-Id: I325826a6798fe6fb3e7d74ff76310e9cb3dd49bc