Inclusion of rxjava source.
Fix for restoreState to improve classloading