Merge "Import Jack server 1.3-a9"
am: a8671f94dc

Change-Id: I1b418a6aae5ae73af061bebd5d72237c2412c11e