Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev