Adds missing Serializables (required for RAP JEE mode).
Minor code cleanup.
Merge "Adds missing Serializables (required for RAP JEE mode). Minor code cleanup."