Apply RxJava #1625 manually

As per https://github.com/ReactiveX/RxJava/pull/1625