Merge "Pipe SatellitePvt fields in JNI" into tm-dev