[RocksJava] Incoroporated changes for D29013