Merge "Use correct classloader in State CREATOR." into nyc-andromeda-dev
am: 48f240222a

Change-Id: Id450e018d5611f2e5a45d54875f8ee2d046a8004