Merge "Log warning if serialized class has compatibility issues" am: f8dfc9872e
am: ff7bc39aba

Change-Id: I65597111a29f3ac52e25c5c86f74a29bf5168877