Apply RxJava #1623 manually

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